Skip to content

CLOUDSTACK-9602: API: improve resource limits comprehension#1554

Merged
yadvr merged 1 commit intoapache:masterfrom
exoscale:feature/resourcelimits
Dec 28, 2017
Merged

CLOUDSTACK-9602: API: improve resource limits comprehension#1554
yadvr merged 1 commit intoapache:masterfrom
exoscale:feature/resourcelimits

Conversation

@marcaurele
Copy link
Member

@marcaurele marcaurele commented May 20, 2016 •
edited
Loading

Add resource type name in request and response.

This adds in the response a new attribute typename with the String value for the corresponding resource enum.

    {
      "capacitytotal": 0,
      "capacityused": 0,
      "percentused": "0",
      "type": 19,
      "typename": "gpu",
      "zoneid": "381d0a95-ed4a-4ad9-b41c-b97073c1a433",
      "zonename": "ch-dk-2"
    }

@marcaurele marcaurele changed the title API: improve resource limits comprenhension API: improve resource limits comprehension May 20, 2016
@bvbharatk
Copy link
Contributor

bvbharatk commented Jun 12, 2016

ACS CI BVT Run

Sumarry:
Build Number 189
Hypervisor xenserver
NetworkType Advanced
Passed=72
Failed=1
Skipped=3

Link to logs Folder (search by build_no): https://www.dropbox.com/sh/yj3wnzbceo9uef2/AAB6u-Iap-xztdm6jHX9SjPja?dl=0

Failed tests:

  • test_vm_life_cycle.py
    • test_10_attachAndDetach_iso Failed

Skipped tests:
test_vm_nic_adapter_vmxnet3
test_static_role_account_acls
test_deploy_vgpu_enabled_vm

Passed test suits:
test_deploy_vm_with_userdata.py
test_affinity_groups_projects.py
test_portable_publicip.py
test_vpc_vpn.py
test_over_provisioning.py
test_global_settings.py
test_scale_vm.py
test_service_offerings.py
test_routers_iptables_default_policy.py
test_routers.py
test_reset_vm_on_reboot.py
test_snapshots.py
test_deploy_vms_with_varied_deploymentplanners.py
test_login.py
test_list_ids_parameter.py
test_public_ip_range.py
test_multipleips_per_nic.py
test_regions.py
test_affinity_groups.py
test_network_acl.py
test_pvlan.py
test_volumes.py
test_nic.py
test_deploy_vm_root_resize.py
test_resource_detail.py
test_secondary_storage.py
test_disk_offerings.py

@marcaurele marcaurele force-pushed the feature/resourcelimits branch from 95d9114 to 6062c47 Compare June 17, 2016 13:22
@yadvr
Copy link
Member

yadvr commented Nov 20, 2016

@marcaurele can you squash your changs, and add a JIRA ticket, thanks
@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Nov 20, 2016

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

blueorangutan commented Nov 20, 2016

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-220

@marcaurele marcaurele changed the title API: improve resource limits comprehension CLOUDSTACK-9602: API: improve resource limits comprehension Nov 23, 2016
@marcaurele
Copy link
Member Author

marcaurele commented Nov 23, 2016 •
edited
Loading

@rhtyd I added the JIRA ticket. Isn't it simpler if you do the squash when you'll merge the PR on master?

@marcaurele marcaurele force-pushed the feature/resourcelimits branch from 58ef573 to f3ecd4b Compare November 23, 2016 06:56
@yadvr
Copy link
Member

yadvr commented Nov 23, 2016

@marcaurele if I squash while merging, the git sha of the commit will change and the PR won't be marked as 'merged'. Which is why we use the git-pr tool that uses a merge strategy to merge the PR preserving the PR commit (sha/ids). Can you please run a git commit --amend when you do change to your PR, thanks. Squash them for now.

fmaximus
fmaximus reviewed Oct 26, 2017
View reviewed changes
api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java Outdated
}
} else if (resourceType != null) {
try {
resourceTypeResult = Resource.ResourceType.values()[resourceType];
Copy link
Contributor

@fmaximus fmaximus Oct 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code here assumes that the ResourceType.getOrdinal() is always in the same order as the enum values.
This might at one moment not be the case..
I would prefer to search for the ResourceType returning the correct value when calling type.getOrdinal()

Copy link
Member Author

@marcaurele marcaurele Oct 30, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct, I updated the change to use the ordinal value use in the each value.

@marcaurele
API: improve resource limits comprenhension
95c0c7b 
Add resource type name in request and response for listResources API
call.

Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
@marcaurele marcaurele force-pushed the feature/resourcelimits branch from f3ecd4b to 95c0c7b Compare October 30, 2017 14:04
@marcaurele
Copy link
Member Author

marcaurele commented Oct 31, 2017

@fmaximus comment has been addressed

@yadvr
Copy link
Member

yadvr commented Nov 22, 2017

LGTM, pending testing.
@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Nov 22, 2017

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

blueorangutan commented Nov 22, 2017

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1283

@yadvr
Copy link
Member

yadvr commented Nov 22, 2017

@blueorangutan test

@blueorangutan
Copy link

blueorangutan commented Nov 22, 2017

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan
Copy link

blueorangutan commented Nov 23, 2017

Trillian test result (tid-1683)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 54343 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr1554-t1683-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py
Intermitten failure detected: /marvin/tests/smoke/test_host_annotations.py
Intermitten failure detected: /marvin/tests/smoke/test_internal_lb.py
Intermitten failure detected: /marvin/tests/smoke/test_iso.py
Intermitten failure detected: /marvin/tests/smoke/test_loadbalance.py
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermitten failure detected: /marvin/tests/smoke/test_snapshots.py
Intermitten failure detected: /marvin/tests/smoke/test_ssvm.py
Intermitten failure detected: /marvin/tests/smoke/test_templates.py
Intermitten failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermitten failure detected: /marvin/tests/smoke/test_volumes.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Test completed. 58 look OK, 9 have error(s)

Test Result Time (s) Test File
test_01_vpc_remote_access_vpn Failure 55.87 test_vpc_vpn.py
test_07_resize_fail Failure 15.36 test_volumes.py
test_04_rvpc_privategw_static_routes Failure 400.61 test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup Failure 334.76 test_privategw_acl.py
test_02_vpc_privategw_static_routes Failure 364.89 test_privategw_acl.py
test_01_vpc_privategw_acl Failure 107.32 test_privategw_acl.py
ContextSuite context=TestSnapshotRootDisk>:setup Error 0.00 test_snapshots.py
ContextSuite context=TestRedundantIsolateNetworks>:setup Error 1798.13 test_routers_network_ops.py
test_04_create_iso_with_no_checksum Error 65.68 test_iso.py
test_04_create_iso_with_no_checksum Error 70.79 test_iso.py
test_03_create_iso_with_checksum_md5 Error 65.98 test_iso.py
test_03_create_iso_with_checksum_md5 Error 71.11 test_iso.py
test_03_1_create_iso_with_checksum_md5_negative Error 70.89 test_iso.py
test_02_create_iso_with_checksum_sha256 Error 65.94 test_iso.py
test_02_create_iso_with_checksum_sha256 Error 71.08 test_iso.py
test_02_1_create_iso_with_checksum_sha256_negative Error 70.68 test_iso.py
test_01_create_iso_with_checksum_sha1 Error 65.81 test_iso.py
test_01_create_iso_with_checksum_sha1 Error 70.92 test_iso.py
test_01_1_create_iso_with_checksum_sha1_negative Error 70.90 test_iso.py
ContextSuite context=TestISO>:setup Error 3910.34 test_iso.py
ContextSuite context=TestInternalLb>:setup Error 0.00 test_internal_lb.py
test_05_add_annotation_for_invalid_entityType Error 0.07 test_host_annotations.py
ContextSuite context=TestDeployVirtioSCSIVM>:setup Error 0.00 test_deploy_virtio_scsi_vm.py
test_change_service_offering_for_vm_with_snapshots Skipped 0.00 test_vm_snapshots.py
test_09_copy_delete_template Skipped 0.02 test_templates.py
test_06_copy_template Skipped 0.00 test_templates.py
test_static_role_account_acls Skipped 0.02 test_staticroles.py
test_11_ss_nfs_version_on_ssvm Skipped 0.02 test_ssvm.py
test_01_scale_vm Skipped 0.00 test_scale_vm.py
test_01_primary_storage_iscsi Skipped 0.13 test_primary_storage.py
test_vm_nic_adapter_vmxnet3 Skipped 0.00 test_nic_adapter_type.py
test_03_nic_multiple_vmware Skipped 1.23 test_nic.py
test_nested_virtualization_vmware Skipped 0.00 test_nested_virtualization.py
test_list_ha_for_host_valid Skipped 0.03 test_hostha_simulator.py
test_list_ha_for_host_invalid Skipped 0.04 test_hostha_simulator.py
test_list_ha_for_host Skipped 0.03 test_hostha_simulator.py
test_hostha_enable_feature_without_setting_provider Skipped 0.04 test_hostha_simulator.py
test_hostha_enable_feature_valid Skipped 0.05 test_hostha_simulator.py
test_hostha_disable_feature_valid Skipped 0.03 test_hostha_simulator.py
test_hostha_configure_invalid_provider Skipped 0.03 test_hostha_simulator.py
test_hostha_configure_default_driver Skipped 0.04 test_hostha_simulator.py
test_ha_verify_fsm_recovering Skipped 0.04 test_hostha_simulator.py
test_ha_verify_fsm_fenced Skipped 0.04 test_hostha_simulator.py
test_ha_verify_fsm_degraded Skipped 0.04 test_hostha_simulator.py
test_ha_verify_fsm_available Skipped 0.04 test_hostha_simulator.py
test_ha_multiple_mgmt_server_ownership Skipped 0.03 test_hostha_simulator.py
test_ha_list_providers Skipped 0.03 test_hostha_simulator.py
test_ha_enable_feature_invalid Skipped 0.03 test_hostha_simulator.py
test_ha_disable_feature_invalid Skipped 0.05 test_hostha_simulator.py
test_ha_configure_enabledisable_across_clusterzones Skipped 0.03 test_hostha_simulator.py
test_configure_ha_provider_valid Skipped 0.03 test_hostha_simulator.py
test_configure_ha_provider_invalid Skipped 0.05 test_hostha_simulator.py
test_deploy_vgpu_enabled_vm Skipped 0.03 test_deploy_vgpu_enabled_vm.py
test_3d_gpu_support Skipped 0.04 test_deploy_vgpu_enabled_vm.py

@yadvr
Copy link
Member

yadvr commented Nov 23, 2017

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Nov 23, 2017

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

blueorangutan commented Nov 23, 2017

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1294

@yadvr
Copy link
Member

yadvr commented Nov 28, 2017

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Nov 28, 2017

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

blueorangutan commented Nov 28, 2017

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1315

@yadvr
Copy link
Member

yadvr commented Dec 19, 2017

@blueorangutan package

@yadvr yadvr added this to the 4.11 milestone Dec 19, 2017
@blueorangutan
Copy link

blueorangutan commented Dec 19, 2017

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

blueorangutan commented Dec 19, 2017

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1416

@yadvr
Copy link
Member

yadvr commented Dec 19, 2017

@blueorangutan test

@blueorangutan
Copy link

blueorangutan commented Dec 19, 2017

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan
Copy link

blueorangutan commented Dec 19, 2017

Trillian test result (tid-1827)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 29335 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr1554-t1827-kvm-centos7.zip
Smoke tests completed. 63 look OK, 4 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
ContextSuite context=TestTemplateHierarchy>:setup Error 1591.58 test_accounts.py
test_01_vpc_privategw_acl Failure 46.68 test_privategw_acl.py
test_02_vpc_privategw_static_routes Failure 263.63 test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup Failure 198.28 test_privategw_acl.py
test_04_rvpc_privategw_static_routes Failure 258.61 test_privategw_acl.py
test_02_create_template_with_checksum_sha1 Error 5.25 test_templates.py
test_03_create_template_with_checksum_sha256 Error 5.26 test_templates.py
test_04_create_template_with_checksum_md5 Error 5.25 test_templates.py
test_01_vpc_remote_access_vpn Error 50.93 test_vpc_vpn.py

@yadvr
Copy link
Member

yadvr commented Dec 19, 2017

Test LGTM, additional review requested for merging this.

@yadvr
Copy link
Member

yadvr commented Dec 25, 2017

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Dec 25, 2017

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

blueorangutan commented Dec 25, 2017

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1484

@yadvr
Copy link
Member

yadvr commented Dec 25, 2017

@blueorangutan test

@blueorangutan
Copy link

blueorangutan commented Dec 25, 2017

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan
Copy link

blueorangutan commented Dec 25, 2017

Trillian test result (tid-1913)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 37819 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr1554-t1913-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_outofbandmanagement.py
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 66 look OK, 0 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File

@yadvr
Copy link
Member

yadvr commented Dec 26, 2017

Tests LGTM, can we have a more code review/lgtm to merge this -- @borisstoyanov @wido @nvazquez @rafaelweingartner @DaanHoogland and others?

borisstoyanov
borisstoyanov approved these changes Dec 28, 2017
View reviewed changes
Copy link
Contributor

@borisstoyanov borisstoyanov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM based on core review and test results

@yadvr
Copy link
Member

yadvr commented Dec 28, 2017

Thanks. Merging this based on 2lgtm/code reviews and test results.

@yadvr yadvr merged commit e27b3e1 into apache:master Dec 28, 2017
@marcaurele marcaurele deleted the feature/resourcelimits branch December 28, 2017 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fmaximus fmaximus fmaximus left review comments

@borisstoyanov borisstoyanov borisstoyanov approved these changes

@wido wido Awaiting requested review from wido

@DaanHoogland DaanHoogland Awaiting requested review from DaanHoogland

@nvazquez nvazquez Awaiting requested review from nvazquez

Assignees

No one assigned

Labels

type:enhancement

Projects

None yet

Milestone

4.11.0.0

Development

Successfully merging this pull request may close these issues.

6 participants

@marcaurele @bvbharatk @yadvr @blueorangutan @fmaximus @borisstoyanov